Merge "Handle no peeking in app info pages" into mnc-dev