Merge "init: fix to avoid loading apex *.rc files twice"