Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."