Merge "Fix bug: wallpaper strip needed two taps to come back" into jb-ub-now-indigo-rose