Merge "Do not wake up until necessary" into tizen_2.1