Merge "Fix issue #21753257: Stability: startActivity asks to run as user 0..." into mnc-dev