Merge "Ensure that the indicator area is set to GONE" into mnc-ub-dev