Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev