Merge "Null check when force navigation bar true and on lockscreen." into tm-dev