Merge pull request #14461 from arcturus/bug-946250

Bug 946250 - When settings is invoked from messaging and closed from home button it does not recover its original status
(cherry picked from commit 9ef1819d2b5b3d0db48538b6b4b8a0af0440a3c2)